From 74d62a92ea135b880c96ff7cb27b6f7a4687b2ee Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 23 Jul 2004 15:01:50 +0000 Subject: [PATCH] Don't iterate too far up. (#147965, Olivier Sessink) Fri Jul 23 11:00:17 2004 Matthias Clasen * gtk/gtktextbtree.c (_gtk_text_line_previous_could_contain_tag): Don't iterate too far up. (#147965, Olivier Sessink) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktextbtree.c | 13 ++++++------- 5 files changed, 26 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9536b9fa53..06008a7a68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jul 23 11:01:00 2004 Matthias Clasen + + * gtk/gtktextbtree.c (_gtk_text_line_previous_could_contain_tag): + Don't iterate too far up. (#147965, Olivier Sessink) + Fri Jul 23 10:28:43 2004 Matthias Clasen * gtk/gtktreeview.c (gtk_tree_view_finalize): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9536b9fa53..06008a7a68 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri Jul 23 11:01:00 2004 Matthias Clasen + + * gtk/gtktextbtree.c (_gtk_text_line_previous_could_contain_tag): + Don't iterate too far up. (#147965, Olivier Sessink) + Fri Jul 23 10:28:43 2004 Matthias Clasen * gtk/gtktreeview.c (gtk_tree_view_finalize): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9536b9fa53..06008a7a68 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri Jul 23 11:01:00 2004 Matthias Clasen + + * gtk/gtktextbtree.c (_gtk_text_line_previous_could_contain_tag): + Don't iterate too far up. (#147965, Olivier Sessink) + Fri Jul 23 10:28:43 2004 Matthias Clasen * gtk/gtktreeview.c (gtk_tree_view_finalize): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9536b9fa53..06008a7a68 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri Jul 23 11:01:00 2004 Matthias Clasen + + * gtk/gtktextbtree.c (_gtk_text_line_previous_could_contain_tag): + Don't iterate too far up. (#147965, Olivier Sessink) + Fri Jul 23 10:28:43 2004 Matthias Clasen * gtk/gtktreeview.c (gtk_tree_view_finalize): diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c index 663207e641..3f5dc5fee8 100644 --- a/gtk/gtktextbtree.c +++ b/gtk/gtktextbtree.c @@ -4487,8 +4487,7 @@ _gtk_text_line_previous_could_contain_tag (GtkTextLine *line, line_ancestor = line->parent; line_ancestor_parent = line->parent->parent; - node = line_ancestor_parent->children.node; - while (node != line_ancestor || line_ancestor != info->tag_root) + while (line_ancestor != info->tag_root) { GSList *child_nodes = NULL; GSList *tmp; @@ -4496,6 +4495,11 @@ _gtk_text_line_previous_could_contain_tag (GtkTextLine *line, /* Create reverse-order list of nodes before * line_ancestor */ + if (line_ancestor_parent != NULL) + node = line_ancestor_parent->children.node; + else + node = line_ancestor; + while (node != line_ancestor && node != NULL) { child_nodes = g_slist_prepend (child_nodes, node); @@ -4526,11 +4530,6 @@ _gtk_text_line_previous_could_contain_tag (GtkTextLine *line, /* Didn't find anything on this level; go up one level. */ line_ancestor = line_ancestor_parent; line_ancestor_parent = line_ancestor->parent; - - if (line_ancestor_parent != NULL) - { - node = line_ancestor_parent->children.node; - } } /* No dice. */ -- 2.30.2